t / t4135 / diff-with backslash.diffon commit sequencer: do not squash 'reword' commits when we hit conflicts (a9279c6)
   1--- post\image.txt.orig 2010-08-18 20:13:31.680002255 -0500
   2+++ post\image.txt      2010-08-18 20:13:31.680002255 -0500
   3@@ -1 +1 @@
   4-preimage
   5+postimage